From 785263291674e4a033afa8ff5345d750bb01a8d0 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 30 May 2025 16:13:45 -0400 Subject: [PATCH] ci: Updates for centos builds - Do the modern way to enable the buildroot with crb and epel Signed-off-by: Colin Walters --- ci/installdeps.sh | 5 +---- ci/libbuild.sh | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/installdeps.sh b/ci/installdeps.sh index d71240e5..bb8a93b4 100755 --- a/ci/installdeps.sh +++ b/ci/installdeps.sh @@ -16,6 +16,7 @@ dn=$(dirname $0) pkg_upgrade pkg_install_buildroot +pkg_install ccache pkg_builddep ostree # Not yet in the spec pkg_install composefs-devel @@ -27,7 +28,3 @@ if test -n "${CI_PKGS:-}"; then fi pkg_install_if_os fedora gjs gnome-desktop-testing parallel coccinelle clang \ python3-PyYAML -if test "${OS_ID}" = "centos"; then - rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - pkg_install python34{,-PyYAML} -fi diff --git a/ci/libbuild.sh b/ci/libbuild.sh index d9b98529..def327af 100644 --- a/ci/libbuild.sh +++ b/ci/libbuild.sh @@ -40,6 +40,9 @@ pkg_install_buildroot() { pkg_install dnf-plugins-core @buildsys-build;; centos) # Sadly this stuff is actually hardcoded in *Python code* in mock... + dnf -y install dnf-utils + dnf config-manager --enable crb + dnf -y install https://dl.fedoraproject.org/pub/epel/epel{,-next}-release-latest-9.noarch.rpm dnf -y install make gcc;; *) fatal "pkg_install_buildroot(): Unhandled OS ${OS_ID}";; esac -- 2.30.2